GDK: Fix builds against latest stable GLib with MSVC

GLib-2.68.x now considers warning C4098 ('void' function returning a value) as
an error, so avoid doing that.

diff --git a/gdk/gdkclipboard.c b/gdk/gdkclipboard.c
index df20366d53433fdfbf678d0efd3a8fa145c10bb4..c3a4759c79f4a0482426d8e2cf7d05a5c25261ad 100644 (file)
--- a/gdk/gdkclipboard.c
+++ b/gdk/gdkclipboard.c
@@ -554,19 +554,19 @@ gdk_clipboard_store_async (GdkClipboard        *clipboard,
 
   if (priv->local)
     {
-      return GDK_CLIPBOARD_GET_CLASS (clipboard)->store_async (clipboard,
-                                                               io_priority,
-                                                               cancellable,
-                                                               callback,
-                                                               user_data);
+      GDK_CLIPBOARD_GET_CLASS (clipboard)->store_async (clipboard,
+                                                        io_priority,
+                                                        cancellable,
+                                                        callback,
+                                                        user_data);
     }
   else
     {
-      return gdk_clipboard_store_default_async (clipboard,
-                                                io_priority,
-                                                cancellable,
-                                                callback,
-                                                user_data);
+      gdk_clipboard_store_default_async (clipboard,
+                                         io_priority,
+                                         cancellable,
+                                         callback,
+                                         user_data);
     }
 }
 

diff --git a/gdk/gdkcontentprovider.c b/gdk/gdkcontentprovider.c
index b01cb43e9365e699868c3ea88d350fc38a4179a9..15e183a1781d54261175ef8416b18011494bc4b3 100644 (file)
--- a/gdk/gdkcontentprovider.c
+++ b/gdk/gdkcontentprovider.c
@@ -377,7 +377,7 @@ gdk_content_provider_attach_clipboard (GdkContentProvider *provider,
   g_return_if_fail (GDK_IS_CONTENT_PROVIDER (provider));
   g_return_if_fail (GDK_IS_CLIPBOARD (clipboard));
 
-  return GDK_CONTENT_PROVIDER_GET_CLASS (provider)->attach_clipboard (provider, clipboard);
+  GDK_CONTENT_PROVIDER_GET_CLASS (provider)->attach_clipboard (provider, clipboard);
 }
 
 void
@@ -387,5 +387,5 @@ gdk_content_provider_detach_clipboard (GdkContentProvider *provider,
   g_return_if_fail (GDK_IS_CONTENT_PROVIDER (provider));
   g_return_if_fail (GDK_IS_CLIPBOARD (clipboard));
 
-  return GDK_CONTENT_PROVIDER_GET_CLASS (provider)->detach_clipboard (provider, clipboard);
+  GDK_CONTENT_PROVIDER_GET_CLASS (provider)->detach_clipboard (provider, clipboard);
 }

diff --git a/gdk/gdktexture.c b/gdk/gdktexture.c
index 07235eb97c5e368f80ce3f686f23d43bfc5ca685..3a22d2133ea72e6cf34df0fb72f99b2a3b76af94 100644 (file)
--- a/gdk/gdktexture.c
+++ b/gdk/gdktexture.c
@@ -446,7 +446,7 @@ gdk_texture_download_area (GdkTexture         *texture,
   g_assert (area->x + area->width <= texture->width);
   g_assert (area->y + area->height <= texture->height);
 
-  return GDK_TEXTURE_GET_CLASS (texture)->download (texture, area, data, stride);
+  GDK_TEXTURE_GET_CLASS (texture)->download (texture, area, data, stride);
 }
 
 /**

diff --git a/gdk/gdktoplevel.c b/gdk/gdktoplevel.c
index 1cf8188b8bd4e85631a3945009bec00710c7f829..ac89e61671acfb025e4d2e8619cb4c5d04fefd4f 100644 (file)
--- a/gdk/gdktoplevel.c
+++ b/gdk/gdktoplevel.c
@@ -364,7 +364,7 @@ gdk_toplevel_focus (GdkToplevel *toplevel,
 {
   g_return_if_fail (GDK_IS_TOPLEVEL (toplevel));
 
-  return GDK_TOPLEVEL_GET_IFACE (toplevel)->focus (toplevel, timestamp);
+  GDK_TOPLEVEL_GET_IFACE (toplevel)->focus (toplevel, timestamp);
 }
 
 /**